From: Glenn Morris <rgm@gnu.org>
Date: Tue, 12 Oct 2010 08:01:11 +0000 (-0700)
Subject: * make-dist: Remove the unnecessary $shortversion.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6112
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5ee885fa0f7f84d0f339e7dd22cbd7efe7c63915;p=emacs.git

* make-dist: Remove the unnecessary $shortversion.
---

diff --git a/make-dist b/make-dist
index c499645c4f2..c713f8e1574 100755
--- a/make-dist
+++ b/make-dist
@@ -153,8 +153,6 @@ then
 fi
 
 ### Find out which version of Emacs this is.
-shortversion=`grep 'char emacs_version' src/emacs.c \
-	 | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
 version=`grep 'char emacs_version' src/emacs.c \
 	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if [ ! "${version}" ]; then
@@ -162,11 +160,11 @@ if [ ! "${version}" ]; then
   exit 1
 fi
 
-echo Version numbers are $version and $shortversion
+echo Version number is $version
 
 if [ $update = yes ];
 then
-  if grep -s "@set EMACSVER  *${shortversion}" ./doc/emacs/emacsver.texi > /dev/null; then
+  if grep -s "@set EMACSVER  *${version}" ./doc/emacs/emacsver.texi > /dev/null; then
     true
   else
     echo "You must update the version number in \`./doc/emacs/emacsver.texi'"